Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 23 Jul 2010 02:35:14 +0000 (02:35 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 23 Jul 2010 02:35:14 +0000 (02:35 +0000)

Trivial merge